Details

Slack thread: https://expensify.slack.com/archives/C05LX9D6E07/p1751978498770109

This PR is a fix to the current Onyx bump PR: Expensify/App#65811.

Some unit tests on E/App are randomly failing with that PR due to the change we made in #620 about how Onyx.update() handles the queued operations.

That change was unnecessary and now it's causing race conditions when we have interactions with React logic and Onyx updates. With this PR we are rolling back to the similar old logic which don't cause race conditions.

As an example, how it's working before this PR:

Onyx.update updateQueue {"session":[{"authToken":"asdfqwerty","accountID":1,"email":"[email protected]","encryptedAuthToken":"asdfqwerty"}],"credentials":[{"autoGeneratedLogin":"expensify.cash-4e802ab6-9606-9784-59c0-dea478774d42","autoGeneratedPassword":"015f2802-3f73-33d2-2ed2-28438d00028f"},{"validateCode":"Password1"}],"account":[{"isUsingExpensifyCard":false},{"isLoading":false,"loadingForm":null}],"betas":[["all"]],"nvp_private_pushNotificationID":["randomID"],"personalDetailsList":[{}]}
Onyx.update updateQueue key operations session [{"authToken":"asdfqwerty","accountID":1,"email":"[email protected]","encryptedAuthToken":"asdfqwerty"}]
Onyx.merge session {"authToken":"asdfqwerty","accountID":1,"email":"[email protected]","encryptedAuthToken":"asdfqwerty"}

Onyx.update updateQueue key operations credentials [{"autoGeneratedLogin":"expensify.cash-4e802ab6-9606-9784-59c0-dea478774d42","autoGeneratedPassword":"015f2802-3f73-33d2-2ed2-28438d00028f"},{"validateCode":"Password1"}]
Onyx.merge credentials {"autoGeneratedLogin":"expensify.cash-4e802ab6-9606-9784-59c0-dea478774d42","autoGeneratedPassword":"015f2802-3f73-33d2-2ed2-28438d00028f"}
Onyx.merge credentials {"validateCode":"Password1"}

Onyx.update updateQueue key operations account [{"isUsingExpensifyCard":false},{"isLoading":false,"loadingForm":null}]
Onyx.merge account {"isUsingExpensifyCard":false}
Onyx.merge account {"isLoading":false,"loadingForm":null}

Onyx.update updateQueue key operations betas [["all"]]
Onyx.merge betas ["all"]

Onyx.update updateQueue key operations nvp_private_pushNotificationID ["randomID"]
Onyx.merge nvp_private_pushNotificationID "randomID"

Onyx.update updateQueue key operations personalDetailsList [{}]
Onyx.merge personalDetailsList {}

And how it will work after this PR (that actually was how it was similarly working before #620):

Onyx.update updateQueue {"session":[{"authToken":"asdfqwerty","accountID":1,"email":"[email protected]","encryptedAuthToken":"asdfqwerty"}],"credentials":[{"autoGeneratedLogin":"expensify.cash-c3c902cd-0d49-151c-0b72-23035925ddad","autoGeneratedPassword":"aebea4a5-8e5d-0193-c2fd-8210eaf303ff"},{"validateCode":"Password1"}],"account":[{"isUsingExpensifyCard":false},{"isLoading":false,"loadingForm":null}],"betas":[["all"]],"nvp_private_pushNotificationID":["randomID"],"personalDetailsList":[{}]}
Onyx.update updateQueue key operations session [{"authToken":"asdfqwerty","accountID":1,"email":"[email protected]","encryptedAuthToken":"asdfqwerty"}]
Onyx.update updateQueue key operations credentials [{"autoGeneratedLogin":"expensify.cash-c3c902cd-0d49-151c-0b72-23035925ddad","autoGeneratedPassword":"aebea4a5-8e5d-0193-c2fd-8210eaf303ff"},{"validateCode":"Password1"}]
Onyx.update updateQueue key operations account [{"isUsingExpensifyCard":false},{"isLoading":false,"loadingForm":null}]
Onyx.update updateQueue key operations betas [["all"]]
Onyx.update updateQueue key operations nvp_private_pushNotificationID ["randomID"]
Onyx.update updateQueue key operations personalDetailsList [{}]

Onyx.merge session {"authToken":"asdfqwerty","accountID":1,"email":"[email protected]","encryptedAuthToken":"asdfqwerty"}
Onyx.merge credentials {"autoGeneratedLogin":"expensify.cash-c3c902cd-0d49-151c-0b72-23035925ddad","autoGeneratedPassword":"aebea4a5-8e5d-0193-c2fd-8210eaf303ff"}
Onyx.merge credentials {"validateCode":"Password1"}
Onyx.merge account {"isUsingExpensifyCard":false}
Onyx.merge account {"isLoading":false,"loadingForm":null}
Onyx.merge betas ["all"]
Onyx.merge nvp_private_pushNotificationID "randomID"
Onyx.merge personalDetailsList {}

Related Issues

Expensify/App#65715

Automated Tests

Unfortunately I couldn't find a way to design unit tests that would simulate these racing conditions between React and Onyx.

Manual Tests

1. Checkout the Onyx bump PR in E/App repo and install dependencies.
2. Checkout this PR in your Onyx repo and connect to E/App repo with these instructions.
3. Run the unit tests a couple of times and assert they pass all times.

Author Checklist

• I linked the correct issue in the ### Related Issues section above
• I wrote clear testing steps that cover the changes made in this PR
  • I added steps for local testing in the Tests section
  • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
• I included screenshots or videos for tests on all platforms
• I ran the tests on all platforms & verified they passed on:
  • Android / native
  • Android / Chrome
  • iOS / native
  • iOS / Safari
  • MacOS / Chrome / Safari
  • MacOS / Desktop
• I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
• I followed proper code patterns (see Reviewing the code)
  • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
  • I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
  • I verified that comments were added to code that is not self explanatory
  • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
  • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
  • I verified the JSDocs style guidelines (in STYLE.md) were followed
• If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
• I followed the guidelines as stated in the Review Guidelines
• I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
• I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
• I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
• I verified that if a function's arguments changed that all usages have also been updated correctly
• If a new component is created I verified that:
  • A similar component doesn't exist in the codebase
  • All props are defined accurately and each prop has a /** comment above it */
  • The file is named correctly
  • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
  • The only data being stored in the state is data necessary for rendering and nothing else
  • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
  • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
  • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
  • All JSX used for rendering exists in the render method
  • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
• If any new file was added I verified that:
  • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
• If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
• If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
• I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.

Screenshots/Videos